From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 3 Oct 2009 12:36:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10098
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a6ef7df45dc01c500f434ef4db656a610de362c0;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a0fa0526d3..ab312990347 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-ftp.el (tramp-ftp-file-name-handler): Disable
+	`file-name-handler-alist' when loading 'ange-ftp.  Otherwise,
+	there could be recursive loading when `default-directory' is a
+	remote file name.  (Bug#4614)
+
 2009-10-03  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/calendar.el (calendar-basic-setup): Handle the case where